# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1097+1.1069.45.5 -> 1.1098 # drivers/char/agp/agpgart_be.c 1.41.1.22 -> 1.54 # drivers/char/Config.in 1.39.1.13 -> 1.53 # drivers/pci/pci.c 1.38.1.7 -> 1.43 # arch/i386/kernel/mpparse.c 1.30.1.7 -> 1.38 # include/linux/pci_ids.h 1.46.1.21 -> 1.71 # arch/ia64/config.in 1.13.4.5 -> 1.30 # Documentation/Configure.help 1.166.1.14 -> 1.179 # diff -Nru a/arch/ia64/config.in b/arch/ia64/config.in --- a/arch/ia64/config.in Thu Oct 9 15:19:38 2003 +++ b/arch/ia64/config.in Thu Oct 9 15:19:38 2003 @@ -114,7 +114,7 @@ int 'Maximum number of CPUs (2-32)' CONFIG_NR_CPUS 32 fi -tristate 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT +bool 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT bool 'Performance monitor support' CONFIG_PERFMON tristate '/proc/pal support' CONFIG_IA64_PALINFO tristate '/proc/efi/vars support' CONFIG_EFI_VARS